Merge 21.5.1 hotfix into release/21.6
#19974
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… only when the app launches (#19961)
As usual when merging a hotfix into a release branch, we got conflicts in the `Version.*.xcconfig` files and they have been resolved by keeping the value from the release branch, as that's what we'll be using for subsequent builds.
Contributor
You can test the changes in Jetpack from this Pull Request by:
|
Contributor
You can test the changes in WordPress from this Pull Request by:
|
Contributor
Author
Auto-merge already kicked in, but anyways I'd say that for a straightforward PR like this one, anyone's approval is fine. Thank you for always helping @twstokes ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What it says on the title.
As a confirmation of the successful hotfix merge, notice diff equals to that from #19961 minus the
RELEASE-NOTES.txtamendment and that theVersion.*.xcconfigfiles have not changed.Next steps
I'll ship a new beta for 21.6. Apart from the fact that we can't ship betas from non release branches, I like how the merge commit from this PR will track the hotfix integration in the Git history neatly.